Check the cairo version

diff --git a/ChangeLog b/ChangeLog
index 589627a7c37993799687923a26596874e901f12e..28baeb67273d126cff4f4fe9455845d73eca06b5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-13  Matthias Clasen  <mclasen@redhat.com>
+
+       * configure.in: Check that we have a new enough Cairo.
+
 2005-07-13  Robert Ögren  <gtk@roboros.com>
 
        Fix handling of Aiptek and Aiptek-like graphical tablets such as Trust

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 589627a7c37993799687923a26596874e901f12e..28baeb67273d126cff4f4fe9455845d73eca06b5 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2005-07-13  Matthias Clasen  <mclasen@redhat.com>
+
+       * configure.in: Check that we have a new enough Cairo.
+
 2005-07-13  Robert Ögren  <gtk@roboros.com>
 
        Fix handling of Aiptek and Aiptek-like graphical tablets such as Trust

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 589627a7c37993799687923a26596874e901f12e..28baeb67273d126cff4f4fe9455845d73eca06b5 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+2005-07-13  Matthias Clasen  <mclasen@redhat.com>
+
+       * configure.in: Check that we have a new enough Cairo.
+
 2005-07-13  Robert Ögren  <gtk@roboros.com>
 
        Fix handling of Aiptek and Aiptek-like graphical tablets such as Trust

diff --git a/configure.in b/configure.in
index 9ca1e97667df281d8608b796bba0c133a07b40d8..ff499539011dd94107e021c1ddf36149526e8789 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -34,6 +34,7 @@ m4_define([gtk_binary_version], [2.4.0])
 m4_define([glib_required_version], [2.7.1])
 m4_define([pango_required_version], [1.9.0])
 m4_define([atk_required_version], [1.0.1])
+m4_define([cairo_required_version], [0.5.1-head])
 
 
 AC_INIT([gtk+], [gtk_version],
@@ -344,7 +345,8 @@ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
 PKG_CHECK_MODULES(BASE_DEPENDENCIES,
   [glib-2.0 >= glib_required_version dnl
    atk >= atk_required_version dnl
-   pango >= pango_required_version])
+   pango >= pango_required_version dnl
+   cairo >= cairo_required_version])
 
 if test "$os_win32" != yes; then
     # libtool option to control which symbols are exported